auto merge of #528 : alexcrichton/cargo/deadlock, r=brson

author bors <bors@rust-lang.org>

Tue, 9 Sep 2014 02:13:47 +0000 (02:13 +0000)

committer bors <bors@rust-lang.org>

Tue, 9 Sep 2014 02:13:47 +0000 (02:13 +0000)
author bors <bors@rust-lang.org>
Tue, 9 Sep 2014 02:13:47 +0000 (02:13 +0000)
committer bors <bors@rust-lang.org>
Tue, 9 Sep 2014 02:13:47 +0000 (02:13 +0000)
diff --cc src/cargo/ops/cargo_rustc/mod.rs
Simple merge
diff --cc tests/test_cargo_compile.rs
Simple merge
author	bors <bors@rust-lang.org>
	Tue, 9 Sep 2014 02:13:47 +0000 (02:13 +0000)
committer	bors <bors@rust-lang.org>
	Tue, 9 Sep 2014 02:13:47 +0000 (02:13 +0000)
		1	2
src/cargo/ops/cargo_rustc/mod.rs	patch \|	diff1 \|	diff2 \|	blob \| history
tests/test_cargo_compile.rs	patch \|	diff1 \|	diff2 \|	blob \| history